home *** CD-ROM | disk | FTP | other *** search
/ The Atari Compendium / The Atari Compendium (Toad Computers) (1994).iso / files / umich / apps / astronmy / strchart.arc / patch.arc / planet.dif < prev    next >
Encoding:
Text File  |  1989-03-23  |  17.6 KB  |  598 lines
  1. *** ../starchart/planet.c    Mon Sep 19 09:11:43 1988
  2. --- planet.c    Mon Sep 26 08:00:31 1988
  3. ***************
  4. *** 45,57 ****
  5.   #include <stdio.h>
  6.   #include <math.h>
  7.   
  8.   #ifndef SYSV
  9.   #include <sys/time.h>    /* for getting current GMT (generic Unix) */
  10.   #else
  11.   #include <time.h>    /* for getting current GMT (sysV version) */
  12.   #endif
  13.   
  14. ! #define CURYEAR    1987    /* default year -- needs to be maintained */
  15.   
  16.   #ifndef PLANETFILE
  17.   #define PLANETFILE "./planet.star"
  18. --- 45,62 ----
  19.   #include <stdio.h>
  20.   #include <math.h>
  21.   
  22. + #ifdef ST_MWC /* Mark Williams C for the Atari ST */
  23. + #define SYSV /* MWC is almost SYSV compatible */
  24. + #include <osbind.h> /* Needed for Cconws() and Crawcin() */
  25. + #endif /* ST_MWC */
  26. + 
  27.   #ifndef SYSV
  28.   #include <sys/time.h>    /* for getting current GMT (generic Unix) */
  29.   #else
  30.   #include <time.h>    /* for getting current GMT (sysV version) */
  31.   #endif
  32.   
  33. ! #define CURYEAR    1989    /* default year -- needs to be maintained */
  34.   
  35.   #ifndef PLANETFILE
  36.   #define PLANETFILE "./planet.star"
  37. ***************
  38. *** 68,73 ****
  39. --- 73,84 ----
  40.   #define MAGURA 590
  41.   #define MAGNEP 800
  42.   
  43. + #ifdef ST_MWC
  44. + #define daylight tt.tm_isdst
  45. + extern char *getenv(); /* used to see if we're running from the desktop */
  46. + struct tm_t *tt;
  47. + #endif /* ST_MWC */
  48. + 
  49.   double pie, rad;
  50.   double htod(), atof(), kepler(), truean();
  51.   double longi(), lati(), poly(), aint(), range();
  52. ***************
  53. *** 119,125 ****
  54. --- 130,138 ----
  55.       gettimeofday(&tv, &tz);
  56.       return(GMT1970 + tv.tv_sec/SECSPERDAY);
  57.   #else
  58. + #ifndef ST_MWC
  59.       long time();
  60. + #endif /* ST_MWC */
  61.       return(GMT1970 + (double)time((long *)0)/SECSPERDAY);
  62.   #endif
  63.       }
  64. ***************
  65. *** 201,207 ****
  66.       aa1 = (int) (year/100);
  67.       bb1 = 2 - aa1 + (int)(aa1/4);
  68.       jd = aint(365.25*year) + aint(30.6001*(month + 1));
  69. !     jd = jd  + day + 1720994.5;
  70.       if((year + month/100) > 1582.10) jd = jd + bb1;
  71.       return(jd);
  72.       }
  73. --- 214,220 ----
  74.       aa1 = (int) (year/100);
  75.       bb1 = 2 - aa1 + (int)(aa1/4);
  76.       jd = aint(365.25*year) + aint(30.6001*(month + 1));
  77. !     jd += day + 1720994.5;
  78.       if((year + month/100) > 1582.10) jd = jd + bb1;
  79.       return(jd);
  80.       }
  81. ***************
  82. *** 218,224 ****
  83. --- 231,243 ----
  84.       double N,D,epli,thapp,omeg;
  85.       double nu2,P,Q,S,V,W,ze,l1pert,epert,w1pert,apert;
  86.       double psi,H,G,eta,th;
  87. + #ifdef ST_MWC
  88. +     time_t now;
  89.   
  90. +     now = time((long) 0);
  91. +     tt = localtime(&now);
  92. + #endif /* ST_MWC */
  93. + 
  94.   #define WRITEMODE "w"
  95.   #define OPENFAIL 0
  96.       progname = argv[0];
  97. ***************
  98. *** 321,327 ****
  99.           RA = atan2(N,D)/rad;
  100.           DEC = asin(sin(epli*rad)*sin(thapp*rad))/rad;
  101.           speak(RA,DEC,Sr, MAGSOL, "PS", "Sol");
  102. ! /* tansformation of coordinates on Mercury and output */
  103.           trans(r,b,ll,Stheta,Sr,epli, MAGMER, "PM", "Mercury");
  104.           
  105.   /* Now start on Venus */
  106. --- 340,346 ----
  107.           RA = atan2(N,D)/rad;
  108.           DEC = asin(sin(epli*rad)*sin(thapp*rad))/rad;
  109.           speak(RA,DEC,Sr, MAGSOL, "PS", "Sol");
  110. ! /* transformation of coordinates on Mercury and output */
  111.           trans(r,b,ll,Stheta,Sr,epli, MAGMER, "PM", "Mercury");
  112.           
  113.   /* Now start on Venus */
  114. ***************
  115. *** 373,380 ****
  116.       radpert = 0.000022501 * cos((2*M-2*M2-58.208)*rad)
  117.            +0.000019045 * cos((3*M-3*M2+92.577)*rad)
  118.            +0.000006887 * cos((M5-M2-118.090)*rad)
  119. !          +0.000005172 * cos((M-M2-29.110)*rad)
  120. !          +0.000003620 * cos((5*M-4*M2-104.208)*rad)
  121.            +0.000003283 * cos((4*M-4*M2+63.513)*rad)
  122.            +0.000003074 * cos((2*M5-2*M2-55.167)*rad);
  123.       r = r + radpert;
  124. --- 392,399 ----
  125.       radpert = 0.000022501 * cos((2*M-2*M2-58.208)*rad)
  126.            +0.000019045 * cos((3*M-3*M2+92.577)*rad)
  127.            +0.000006887 * cos((M5-M2-118.090)*rad)
  128. !          +0.000005172 * cos((M-M2-29.110)*rad);
  129. !     radpert+= 0.000003620 * cos((5*M-4*M2-104.208)*rad)
  130.            +0.000003283 * cos((4*M-4*M2+63.513)*rad)
  131.            +0.000003074 * cos((2*M5-2*M2-55.167)*rad);
  132.       r = r + radpert;
  133. ***************
  134. *** 425,432 ****
  135.       lonpert = 0.00705*cos((M5-M4-48.958)*rad)
  136.            +0.00607*cos((2*M5-M4-188.350)*rad)
  137.            +0.00445*cos((2*M5-2*M4-191.897)*rad)
  138. !          +0.00388*cos((M-2*M4+20.495)*rad)
  139. !          +0.00238*cos((M-M4+35.097)*rad)
  140.            +0.00204*cos((2*M-3*M4+158.638)*rad)
  141.            +0.00177*cos((3*M4-M2-57.602)*rad)
  142.            +0.00136*cos((2*M-4*M4+154.093)*rad)
  143. --- 444,451 ----
  144.       lonpert = 0.00705*cos((M5-M4-48.958)*rad)
  145.            +0.00607*cos((2*M5-M4-188.350)*rad)
  146.            +0.00445*cos((2*M5-2*M4-191.897)*rad)
  147. !          +0.00388*cos((M-2*M4+20.495)*rad);
  148. !     lonpert+= 0.00238*cos((M-M4+35.097)*rad)
  149.            +0.00204*cos((2*M-3*M4+158.638)*rad)
  150.            +0.00177*cos((3*M4-M2-57.602)*rad)
  151.            +0.00136*cos((2*M-4*M4+154.093)*rad)
  152. ***************
  153. *** 445,452 ****
  154.       radpert+= 0.000007914*cos((3*M5-2*M4-139.737)*rad)
  155.            +0.000007004*cos((2*M5-3*M4-102.888)*rad)
  156.            +0.000006620*cos((M-2*M4+113.202)*rad)
  157. !          +0.000004930*cos((3*M5-3*M4-76.243)*rad)
  158. !          +0.000004693*cos((3*M-5*M4+190.603)*rad)
  159.            +0.000004571*cos((2*M-4*M4+244.702)*rad)
  160.            +0.000004409*cos((3*M5-M4-115.828)*rad);
  161.       r = r + radpert;
  162. --- 464,471 ----
  163.       radpert+= 0.000007914*cos((3*M5-2*M4-139.737)*rad)
  164.            +0.000007004*cos((2*M5-3*M4-102.888)*rad)
  165.            +0.000006620*cos((M-2*M4+113.202)*rad)
  166. !          +0.000004930*cos((3*M5-3*M4-76.243)*rad);
  167. !     radpert+= 0.000004693*cos((3*M-5*M4+190.603)*rad)
  168.            +0.000004571*cos((2*M-4*M4+244.702)*rad)
  169.            +0.000004409*cos((3*M5-M4-115.828)*rad);
  170.       r = r + radpert;
  171. ***************
  172. *** 507,513 ****
  173.       -(0.003083 + 0.000275*nu2 - 0.000489*nu2*nu2)*sin(2*V)
  174.       +0.002472*sin(W)
  175.       +0.013619*sin(ze)
  176. !     +0.018472*sin(2*ze)
  177.       +0.006717*sin(3*ze)
  178.       +0.002775*sin(4*ze)
  179.       +(0.007275 - 0.001253*nu2)*sin(ze)*sin(Q)
  180. --- 526,533 ----
  181.       -(0.003083 + 0.000275*nu2 - 0.000489*nu2*nu2)*sin(2*V)
  182.       +0.002472*sin(W)
  183.       +0.013619*sin(ze)
  184. !     +0.018472*sin(2*ze);
  185. ! l1pert = l1pert
  186.       +0.006717*sin(3*ze)
  187.       +0.002775*sin(4*ze)
  188.       +(0.007275 - 0.001253*nu2)*sin(ze)*sin(Q)
  189. ***************
  190. *** 519,525 ****
  191.       -(0.035681 + 0.001208*nu2)*sin(ze)*cos(Q)
  192.       -0.004261*sin(2*ze)*cos(Q)
  193.       +0.002178*cos(Q)
  194. !     +(-0.006333 + 0.001161*nu2)*cos(ze)*cos(Q)
  195.       -0.006675*cos(2*ze)*cos(Q)
  196.       -0.002664*cos(3*ze)*cos(Q)
  197.       -0.002572*sin(ze)*sin(2*Q)
  198. --- 539,546 ----
  199.       -(0.035681 + 0.001208*nu2)*sin(ze)*cos(Q)
  200.       -0.004261*sin(2*ze)*cos(Q)
  201.       +0.002178*cos(Q)
  202. !     +(-0.006333 + 0.001161*nu2)*cos(ze)*cos(Q);
  203. ! l1pert = l1pert
  204.       -0.006675*cos(2*ze)*cos(Q)
  205.       -0.002664*cos(3*ze)*cos(Q)
  206.       -0.002572*sin(ze)*sin(2*Q)
  207. ***************
  208. *** 532,538 ****
  209.       -.0006764*sin(ze)*sin(Q)
  210.       -.0001110*sin(2*ze)*sin(Q)
  211.       -.0000224*sin(3*ze)*sin(Q)
  212. !     -.0000204*sin(Q)
  213.       +(.0001284 + .0000116*nu2)*cos(ze)*sin(Q)
  214.       +.0000188*cos(2*ze)*sin(Q)
  215.       +(.0001460 + .0000130*nu2)*sin(ze)*cos(Q)
  216. --- 553,560 ----
  217.       -.0006764*sin(ze)*sin(Q)
  218.       -.0001110*sin(2*ze)*sin(Q)
  219.       -.0000224*sin(3*ze)*sin(Q)
  220. !     -.0000204*sin(Q);
  221. ! epert = epert
  222.       +(.0001284 + .0000116*nu2)*cos(ze)*sin(Q)
  223.       +.0000188*cos(2*ze)*sin(Q)
  224.       +(.0001460 + .0000130*nu2)*sin(ze)*cos(Q)
  225. ***************
  226. *** 544,550 ****
  227.       +.0000508*cos(3*ze)*cos(Q)
  228.       +.0000230*cos(4*ze)*cos(Q)
  229.       +.0000108*cos(5*ze)*cos(Q)
  230. !     -(.0000956 + .0000073*nu2)*sin(ze)*sin(2*Q)
  231.       +.0000448*sin(2*ze)*sin(2*Q)
  232.       +.0000137*sin(3*ze)*sin(2*Q)
  233.       +(-.0000997 + .0000108*nu2)*cos(ze)*sin(2*Q)
  234. --- 566,573 ----
  235.       +.0000508*cos(3*ze)*cos(Q)
  236.       +.0000230*cos(4*ze)*cos(Q)
  237.       +.0000108*cos(5*ze)*cos(Q)
  238. !     -(.0000956 + .0000073*nu2)*sin(ze)*sin(2*Q);
  239. ! epert = epert
  240.       +.0000448*sin(2*ze)*sin(2*Q)
  241.       +.0000137*sin(3*ze)*sin(2*Q)
  242.       +(-.0000997 + .0000108*nu2)*cos(ze)*sin(2*Q)
  243. ***************
  244. *** 554,560 ****
  245.       +(-.0000956 +.0000099*nu2)*sin(ze)*cos(2*Q)
  246.       +.0000490*sin(2*ze)*cos(2*Q)
  247.       +.0000158*sin(3*ze)*cos(2*Q)
  248. !     +.0000179*cos(2*Q)
  249.       +(.0001024 + .0000075*nu2)*cos(ze)*cos(2*Q)
  250.       -.0000437*cos(2*ze)*cos(2*Q)
  251.       -.0000132*cos(3*ze)*cos(2*Q);
  252. --- 577,584 ----
  253.       +(-.0000956 +.0000099*nu2)*sin(ze)*cos(2*Q)
  254.       +.0000490*sin(2*ze)*cos(2*Q)
  255.       +.0000158*sin(3*ze)*cos(2*Q)
  256. !     +.0000179*cos(2*Q);
  257. ! epert = epert
  258.       +(.0001024 + .0000075*nu2)*cos(ze)*cos(2*Q)
  259.       -.0000437*cos(2*ze)*cos(2*Q)
  260.       -.0000132*cos(3*ze)*cos(2*Q);
  261. ***************
  262. *** 562,568 ****
  263.   w1pert = (0.007192 - 0.003147*nu2)*sin(V)
  264.       +(-0.020428 - 0.000675*nu2 + 0.000197*nu2*nu2)*cos(V)
  265.       +(0.007269 + 0.000672*nu2)*sin(ze)*sin(Q)
  266. !     -0.004344*sin(Q)
  267.       +0.034036*cos(ze)*sin(Q)
  268.       +0.005614*cos(2*ze)*sin(Q)
  269.       +0.002964*cos(3*ze)*sin(Q)
  270. --- 586,593 ----
  271.   w1pert = (0.007192 - 0.003147*nu2)*sin(V)
  272.       +(-0.020428 - 0.000675*nu2 + 0.000197*nu2*nu2)*cos(V)
  273.       +(0.007269 + 0.000672*nu2)*sin(ze)*sin(Q)
  274. !     -0.004344*sin(Q);
  275. ! w1pert = w1pert
  276.       +0.034036*cos(ze)*sin(Q)
  277.       +0.005614*cos(2*ze)*sin(Q)
  278.       +0.002964*cos(3*ze)*sin(Q)
  279. ***************
  280. *** 573,579 ****
  281.       -0.006603*cos(ze)*cos(Q)
  282.       -0.005356*sin(ze)*sin(2*Q)
  283.       +0.002722*sin(2*ze)*sin(2*Q)
  284. !     +0.004483*cos(ze)*sin(2*Q)
  285.       -0.002642*cos(2*ze)*sin(2*Q)
  286.       +0.004403*sin(ze)*cos(2*Q)
  287.       -0.002536*sin(2*ze)*cos(2*Q)
  288. --- 598,605 ----
  289.       -0.006603*cos(ze)*cos(Q)
  290.       -0.005356*sin(ze)*sin(2*Q)
  291.       +0.002722*sin(2*ze)*sin(2*Q)
  292. !     +0.004483*cos(ze)*sin(2*Q);
  293. ! w1pert = w1pert
  294.       -0.002642*cos(2*ze)*sin(2*Q)
  295.       +0.004403*sin(ze)*cos(2*Q)
  296.       -0.002536*sin(2*ze)*cos(2*Q)
  297. ***************
  298. *** 591,597 ****
  299.       +.000693*cos(2*ze)
  300.       +.000312*cos(3*ze)
  301.       +.000147*cos(4*ze)
  302. !     +.000299*sin(ze)*sin(Q)
  303.       +.000181*cos(2*ze)*sin(Q)
  304.       +.000204*sin(2*ze)*cos(Q)
  305.       +.000111*sin(3*ze)*cos(Q)
  306. --- 617,624 ----
  307.       +.000693*cos(2*ze)
  308.       +.000312*cos(3*ze)
  309.       +.000147*cos(4*ze)
  310. !     +.000299*sin(ze)*sin(Q);
  311. ! apert = apert
  312.       +.000181*cos(2*ze)*sin(Q)
  313.       +.000204*sin(2*ze)*cos(Q)
  314.       +.000111*sin(3*ze)*cos(Q)
  315. ***************
  316. *** 645,651 ****
  317.   l1pert = (-0.814181 + 0.018150*nu2 + 0.016714*nu2*nu2)*sin(V)
  318.        +(-0.010497 + 0.160906*nu2 - 0.004100*nu2*nu2)*cos(V)
  319.        +0.007581*sin(2*V)
  320. !      -0.007986*sin(W)
  321.        -0.148811*sin(ze)
  322.        -0.040786*sin(2*ze)
  323.        -0.015208*sin(3*ze)
  324. --- 672,679 ----
  325.   l1pert = (-0.814181 + 0.018150*nu2 + 0.016714*nu2*nu2)*sin(V)
  326.        +(-0.010497 + 0.160906*nu2 - 0.004100*nu2*nu2)*cos(V)
  327.        +0.007581*sin(2*V)
  328. !      -0.007986*sin(W);
  329. ! l1pert = l1pert
  330.        -0.148811*sin(ze)
  331.        -0.040786*sin(2*ze)
  332.        -0.015208*sin(3*ze)
  333. ***************
  334. *** 655,661 ****
  335.       +(0.008931 + 0.002728*nu2)*sin(ze)*sin(Q)
  336.       -0.016500*sin(2*ze)*sin(Q)
  337.       -0.005775*sin(3*ze)*sin(Q)
  338. !     +(0.081344 + 0.003206*nu2)*cos(ze)*sin(Q)
  339.       +0.015019*cos(2*ze)*sin(Q)
  340.       +(0.085581 + 0.002494*nu2)*sin(ze)*cos(Q)
  341.       +(0.025328 - 0.003117*nu2)*cos(ze)*cos(Q);
  342. --- 683,690 ----
  343.       +(0.008931 + 0.002728*nu2)*sin(ze)*sin(Q)
  344.       -0.016500*sin(2*ze)*sin(Q)
  345.       -0.005775*sin(3*ze)*sin(Q)
  346. !     +(0.081344 + 0.003206*nu2)*cos(ze)*sin(Q);
  347. ! l1pert = l1pert
  348.       +0.015019*cos(2*ze)*sin(Q)
  349.       +(0.085581 + 0.002494*nu2)*sin(ze)*cos(Q)
  350.       +(0.025328 - 0.003117*nu2)*cos(ze)*cos(Q);
  351. ***************
  352. *** 663,669 ****
  353.       +0.014394*cos(2*ze)*cos(Q)
  354.       +0.006319*cos(3*ze)*cos(Q)
  355.       +0.006369*sin(ze)*sin(2*Q)
  356. !     +0.009156*sin(2*ze)*sin(2*Q)
  357.       +0.007525*sin(3*psi)*sin(2*Q)
  358.       -0.005236*cos(ze)*cos(2*Q)
  359.       -0.007736*cos(2*ze)*cos(2*Q)
  360. --- 692,699 ----
  361.       +0.014394*cos(2*ze)*cos(Q)
  362.       +0.006319*cos(3*ze)*cos(Q)
  363.       +0.006369*sin(ze)*sin(2*Q)
  364. !     +0.009156*sin(2*ze)*sin(2*Q);
  365. ! l1pert = l1pert
  366.       +0.007525*sin(3*psi)*sin(2*Q)
  367.       -0.005236*cos(ze)*cos(2*Q)
  368.       -0.007736*cos(2*ze)*cos(2*Q)
  369. ***************
  370. *** 673,679 ****
  371.       +(.0013381 + .0001226*nu2 -.0000253*nu2*nu2)*cos(V)
  372.       +(.0000248 - .0000121*nu2)*sin(2*V)
  373.       -(.0000305 + .0000091*nu2)*cos(2*V)
  374. !     +.0000412*sin(2*ze)
  375.       +.0012415*sin(Q)
  376.       +(.0000390 -.0000617*nu2)*sin(ze)*sin(Q)
  377.       +(.0000165 - .0000204*nu2)*sin(2*ze)*sin(Q)
  378. --- 703,710 ----
  379.       +(.0013381 + .0001226*nu2 -.0000253*nu2*nu2)*cos(V)
  380.       +(.0000248 - .0000121*nu2)*sin(2*V)
  381.       -(.0000305 + .0000091*nu2)*cos(2*V)
  382. !     +.0000412*sin(2*ze);
  383. ! epert = epert
  384.       +.0012415*sin(Q)
  385.       +(.0000390 -.0000617*nu2)*sin(ze)*sin(Q)
  386.       +(.0000165 - .0000204*nu2)*sin(2*ze)*sin(Q)
  387. ***************
  388. *** 684,690 ****
  389.       -.0000821*cos(4*ze)*sin(Q)
  390.       -.0000377*cos(5*ze)*sin(Q)
  391.       +.0000497*cos(2*psi)*sin(Q)
  392. !     +(.0000163 - .0000611*nu2)*cos(Q)
  393.       -.0012696*sin(ze)*cos(Q)
  394.       -.0004200*sin(2*ze)*cos(Q)
  395.       -.0001503*sin(3*ze)*cos(Q)
  396. --- 715,722 ----
  397.       -.0000821*cos(4*ze)*sin(Q)
  398.       -.0000377*cos(5*ze)*sin(Q)
  399.       +.0000497*cos(2*psi)*sin(Q)
  400. !     +(.0000163 - .0000611*nu2)*cos(Q);
  401. ! epert = epert
  402.       -.0012696*sin(ze)*cos(Q)
  403.       -.0004200*sin(2*ze)*cos(Q)
  404.       -.0001503*sin(3*ze)*cos(Q)
  405. ***************
  406. *** 695,701 ****
  407.       +(-.0000086 + .0000230*nu2)*cos(2*ze)*cos(Q)
  408.       +.0000461*sin(2*psi)*cos(Q)
  409.       -.0000350*sin(2*Q)
  410. !     +(.0002211 - .0000286*nu2)*sin(ze)*sin(2*Q)
  411.       -.0002208*sin(2*ze)*sin(2*Q)
  412.       -.0000568*sin(3*ze)*sin(2*Q)
  413.       -.0000346*sin(4*ze)*sin(2*Q)
  414. --- 727,734 ----
  415.       +(-.0000086 + .0000230*nu2)*cos(2*ze)*cos(Q)
  416.       +.0000461*sin(2*psi)*cos(Q)
  417.       -.0000350*sin(2*Q)
  418. !     +(.0002211 - .0000286*nu2)*sin(ze)*sin(2*Q);
  419. ! epert = epert
  420.       -.0002208*sin(2*ze)*sin(2*Q)
  421.       -.0000568*sin(3*ze)*sin(2*Q)
  422.       -.0000346*sin(4*ze)*sin(2*Q)
  423. ***************
  424. *** 707,713 ****
  425.       +.0000467*cos(3*psi)*sin(2*Q)
  426.       -.0000490*cos(2*Q)
  427.       -(.0002842 + .0000279*nu2)*sin(ze)*cos(2*Q)
  428. !     +(.0000128 + .0000226*nu2)*sin(2*ze)*cos(2*Q)
  429.       +.0000224*sin(3*ze)*cos(2*Q)
  430.       +(-.0001594 + .0000282*nu2)*cos(ze)*cos(2*Q)
  431.       +(.0002162 - .0000207*nu2)*cos(2*ze)*cos(2*Q)
  432. --- 740,747 ----
  433.       +.0000467*cos(3*psi)*sin(2*Q)
  434.       -.0000490*cos(2*Q)
  435.       -(.0002842 + .0000279*nu2)*sin(ze)*cos(2*Q)
  436. !     +(.0000128 + .0000226*nu2)*sin(2*ze)*cos(2*Q);
  437. ! epert = epert
  438.       +.0000224*sin(3*ze)*cos(2*Q)
  439.       +(-.0001594 + .0000282*nu2)*cos(ze)*cos(2*Q)
  440.       +(.0002162 - .0000207*nu2)*cos(2*ze)*cos(2*Q)
  441. ***************
  442. *** 716,722 ****
  443.       +.0000343*cos(4*ze)*cos(2*Q)
  444.       +.0000469*sin(3*psi)*cos(2*Q)
  445.       -.0000242*cos(3*psi)*cos(2*Q)
  446. !     -.0000205*sin(ze)*sin(3*Q)
  447.       +.0000262*sin(3*ze)*sin(3*Q)
  448.       +.0000208*cos(ze)*cos(3*Q)
  449.       -.0000271*cos(3*ze)*cos(3*Q)
  450. --- 750,757 ----
  451.       +.0000343*cos(4*ze)*cos(2*Q)
  452.       +.0000469*sin(3*psi)*cos(2*Q)
  453.       -.0000242*cos(3*psi)*cos(2*Q)
  454. !     -.0000205*sin(ze)*sin(3*Q);
  455. ! epert = epert
  456.       +.0000262*sin(3*ze)*sin(3*Q)
  457.       +.0000208*cos(ze)*cos(3*Q)
  458.       -.0000271*cos(3*ze)*cos(3*Q)
  459. ***************
  460. *** 728,734 ****
  461.       -0.007075*sin(ze)
  462.       -0.075825*sin(ze)*sin(Q)
  463.       -0.024839*sin(2*ze)*sin(Q)
  464. !     -0.008631*sin(3*ze)*sin(Q)
  465.       -0.072586*cos(Q)
  466.       -0.150383*cos(ze)*cos(Q)
  467.       +0.026897*cos(2*ze)*cos(Q)
  468. --- 763,770 ----
  469.       -0.007075*sin(ze)
  470.       -0.075825*sin(ze)*sin(Q)
  471.       -0.024839*sin(2*ze)*sin(Q)
  472. !     -0.008631*sin(3*ze)*sin(Q);
  473. ! w1pert = w1pert
  474.       -0.072586*cos(Q)
  475.       -0.150383*cos(ze)*cos(Q)
  476.       +0.026897*cos(2*ze)*cos(Q)
  477. ***************
  478. *** 737,743 ****
  479.       -(0.013597 +0.001719*nu2)*sin(ze)*sin(2*Q)
  480.       +(-0.007742 + 0.001517*nu2)*cos(ze)*sin(2*Q)
  481.       +(0.013586 - 0.001375*nu2)*cos(2*ze)*sin(2*Q)
  482. !     +(-0.013667 + 0.001239*nu2)*sin(ze)*cos(2*Q)
  483.       +0.011981*sin(2*ze)*cos(2*Q)
  484.       +(0.014861 + 0.001136*nu2)*cos(ze)*cos(2*Q)
  485.       -(0.013064 + 0.001628*nu2)*cos(2*ze)*cos(2*Q);
  486. --- 773,780 ----
  487.       -(0.013597 +0.001719*nu2)*sin(ze)*sin(2*Q)
  488.       +(-0.007742 + 0.001517*nu2)*cos(ze)*sin(2*Q)
  489.       +(0.013586 - 0.001375*nu2)*cos(2*ze)*sin(2*Q)
  490. !     +(-0.013667 + 0.001239*nu2)*sin(ze)*cos(2*Q);
  491. ! w1pert = w1pert
  492.       +0.011981*sin(2*ze)*cos(2*Q)
  493.       +(0.014861 + 0.001136*nu2)*cos(ze)*cos(2*Q)
  494.       -(0.013064 + 0.001628*nu2)*cos(2*ze)*cos(2*Q);
  495. ***************
  496. *** 751,757 ****
  497.   apert = .000572*sin(V) -.001590*sin(2*ze)*cos(Q)
  498.       +.002933*cos(V) -.000647*sin(3*ze)*cos(Q)
  499.       +.033629*cos(ze) -.000344*sin(4*ze)*cos(Q)
  500. !     -.003081*cos(2*ze) +.002885*cos(ze)*cos(Q)
  501.       -.001423*cos(3*ze) +(.002172 + .000102*nu2)*cos(2*ze)*cos(Q)
  502.       -.000671*cos(4*ze) +.000296*cos(3*ze)*cos(Q)
  503.       -.000320*cos(5*ze) -.000267*sin(2*ze)*sin(2*Q);
  504. --- 788,795 ----
  505.   apert = .000572*sin(V) -.001590*sin(2*ze)*cos(Q)
  506.       +.002933*cos(V) -.000647*sin(3*ze)*cos(Q)
  507.       +.033629*cos(ze) -.000344*sin(4*ze)*cos(Q)
  508. !     -.003081*cos(2*ze) +.002885*cos(ze)*cos(Q);
  509. ! apert = apert
  510.       -.001423*cos(3*ze) +(.002172 + .000102*nu2)*cos(2*ze)*cos(Q)
  511.       -.000671*cos(4*ze) +.000296*cos(3*ze)*cos(Q)
  512.       -.000320*cos(5*ze) -.000267*sin(2*ze)*sin(2*Q);
  513. ***************
  514. *** 763,769 ****
  515.       -.000393*sin(3*ze)*sin(Q)
  516.       -.000228*sin(4*ze)*sin(Q)
  517.       +.002138*cos(ze)*sin(Q)
  518. !     -.000999*cos(2*ze)*sin(Q)
  519.       -.000642*cos(3*ze)*sin(Q)
  520.       -.000325*cos(4*ze)*sin(Q)
  521.       -.000890*cos(Q)
  522. --- 801,808 ----
  523.       -.000393*sin(3*ze)*sin(Q)
  524.       -.000228*sin(4*ze)*sin(Q)
  525.       +.002138*cos(ze)*sin(Q)
  526. !     -.000999*cos(2*ze)*sin(Q);
  527. ! apert = apert
  528.       -.000642*cos(3*ze)*sin(Q)
  529.       -.000325*cos(4*ze)*sin(Q)
  530.       -.000890*cos(Q)
  531. ***************
  532. *** 772,778 ****
  533.       -.000856*sin(ze)*cos(2*Q)
  534.       +.000441*sin(2*ze)*cos(2*Q)
  535.       +.000296*cos(2*ze)*cos(2*Q)
  536. !     +.000211*cos(3*ze)*cos(2*Q)
  537.       -.000427*sin(ze)*sin(3*Q)
  538.       +.000398*sin(3*ze)*sin(3*Q)
  539.       +.000344*cos(ze)*cos(3*Q)
  540. --- 811,818 ----
  541.       -.000856*sin(ze)*cos(2*Q)
  542.       +.000441*sin(2*ze)*cos(2*Q)
  543.       +.000296*cos(2*ze)*cos(2*Q)
  544. !     +.000211*cos(3*ze)*cos(2*Q);
  545. ! apert = apert
  546.       -.000427*sin(ze)*sin(3*Q)
  547.       +.000398*sin(3*ze)*sin(3*Q)
  548.       +.000344*cos(ze)*cos(3*Q)
  549. ***************
  550. *** 1002,1009 ****
  551.       +.001051*cos(2*th);
  552.   trans(r,b,ll,Stheta,Sr,epli, MAGNEP, "PN", "Neptune");
  553.   
  554.   putchar('\n');
  555. ! close(logfile);
  556.   exit(0);
  557.   } /* end of program main */
  558.   
  559. --- 1042,1061 ----
  560.       +.001051*cos(2*th);
  561.   trans(r,b,ll,Stheta,Sr,epli, MAGNEP, "PN", "Neptune");
  562.   
  563. + #ifdef ST_MWC
  564. + Cconws("\r\n");
  565. + #else /* !ST_MWC */
  566.   putchar('\n');
  567. ! #endif /* ST_MWC */
  568. ! fclose(logfile);
  569. ! #ifdef ST_MWC /* We want to hold the screen if invoked from the GEM desktop; */
  570. !            /* the desktop doesn't usually set any environment variables, */
  571. !            /* and if getenv() does find anything, it's probably empty */
  572. ! if (((getenv("PATH")) == 0) || (strlen(getenv("PATH")) == 0)) {
  573. !      Cconws("press any key to continue: "); /* Hold screen if desktop */
  574. !      i = Crawcin(); /* Read raw character input */
  575. ! }
  576. ! #endif /* ST_MWC */
  577.   exit(0);
  578.   } /* end of program main */
  579.   
  580. ***************
  581. *** 1023,1031 ****
  582. --- 1075,1089 ----
  583.   double aint(z)
  584.       double z;
  585.   {
  586. + #ifdef ST_MWC /* In Mark Williams C ints are 16 bits long, so use longs */
  587. +     long trunk;
  588. +     
  589. +     trunk = (long)z;
  590. + #else /* !ST_MWC */
  591.       int trunk;
  592.       
  593.       trunk = (int)z;
  594. + #endif /* ST_MWC */
  595.       z = (double) trunk;
  596.       return(z);
  597.   }
  598.